bitkeeper revision 1.1389.5.52 (4280b9beG5xwTCb0TZxrZ0Cx_ku3fQ)

smpboot.c:
  start_secondary doesn't return anything.
  Dprintk gets defined in apic.h now.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c
index bbe096394244600866cc46c38d0f6a6506fe08b3..05ca6a3ee7c586baa71eb9ac2f62dad758d5e435 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c
@@ -51,11 +51,6 @@
 #include <asm/desc.h>
 #include <asm/arch_hooks.h>
 
-#if 1
-#define Dprintk(args...)
-#else
-#include <mach_apic.h>
-#endif
 #include <mach_wakecpu.h>
 #include <smpboot_hooks.h>
 
@@ -462,7 +457,7 @@ extern void local_setup_timer(void);
 /*
  * Activate a secondary processor.
  */
-static int __init start_secondary(void *unused)
+static void __init start_secondary(void *unused)
 {
        /*
         * Dont put anything before smp_callin(), SMP